Merge branch 'wip/otte/geometry' into 'master'

Some GdkGeometry cleanups

See merge request GNOME/gtk!2322

diff --cc gdk/gdkinternals.h
Simple merge

diff --cc gdk/gdksurface.c
Simple merge

diff --cc gdk/win32/gdkevents-win32.c
Simple merge

diff --cc gdk/win32/gdksurface-win32.c
Simple merge

diff --cc gdk/x11/gdksurface-x11.c
Simple merge